Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 10 Sep 2010 05:38:52 +0000 (05:38 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 10 Sep 2010 05:38:52 +0000 (05:38 +0000)

Trivial merge